Autogenerated HTML docs for v2.13.1-516-g05ec6
diff --git a/RelNotes/2.14.0.txt b/RelNotes/2.14.0.txt index 257f1e7..a71615a 100644 --- a/RelNotes/2.14.0.txt +++ b/RelNotes/2.14.0.txt
@@ -70,6 +70,22 @@ * Many commands learned to pay attention to submodule.recurse configuration. + * The convention for a command line is to follow "git cmdname + --options" with revisions followed by an optional "--" + disambiguator and then finally pathspecs. When "--" is not there, + we make sure early ones are all interpretable as revs (and do not + look like paths) and later ones are the other way around. A + pathspec with "magic" (e.g. ":/p/a/t/h" that matches p/a/t/h from + the top-level of the working tree, no matter what subdirectory you + are working from) are conservatively judged as "not a path", which + required disambiguation more often. The command line parser + learned to say "it's a pathspec" a bit more often when the syntax + looks like so. + (merge 2cb47ab695 jk/pathspec-magic-disambiguation later to maint). + + * Update "perl-compatible regular expression" support to enable JIT + and also allow linking with the newer PCRE v2 library. + Performance, Internal Implementation, Development Support etc. @@ -146,6 +162,12 @@ optional, and silently ignore errors from open/fopen; report such errors if they are not due to missing files. + * When an existing repository is used for t/perf testing, we first + create bit-for-bit copy of it, which may grab a transient state of + the repository and freeze it into the repository used for testing, + which then may cause Git operations to fail. Single out "the index + being locked" case and forcibly drop the lock from the copy. + Also contains various documentation updates and code clean-ups. @@ -309,5 +331,12 @@ * A flaky test has been corrected. (merge 7c2115aa07 jk/pack-idx-corruption-safety later to maint). + * "git $cmd -h" for builtin commands calls the implementation of the + command (i.e. cmd_$cmd() function) without doing any repository + set-up, and the commands that expect RUN_SETUP is done by the Git + potty needs to be prepared to show the help text without barfing. + (merge d691551192 jk/consistent-h later to maint). + * Other minor doc, test and build updates and code cleanups. (merge 8ba74bfd7c jc/diff-tree-stale-comment later to maint). + (merge 68602c01fd sb/submodule-rm-absorb later to maint).
diff --git a/git-log.html b/git-log.html index cfcc28f..65823b5 100644 --- a/git-log.html +++ b/git-log.html
@@ -1078,6 +1078,9 @@ </p> </dd> <dt class="hdlist1"> +-P +</dt> +<dt class="hdlist1"> --perl-regexp </dt> <dd> @@ -4242,7 +4245,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2016-07-12 05:08:30 JST +Last updated 2016-07-11 13:08:30 PDT </div> </div> </body>
diff --git a/git-rev-list.html b/git-rev-list.html index 8046e78..8a19f06 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -1020,6 +1020,9 @@ </p> </dd> <dt class="hdlist1"> +-P +</dt> +<dt class="hdlist1"> --perl-regexp </dt> <dd> @@ -2793,7 +2796,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-10-06 05:38:43 JST +Last updated 2015-10-05 13:38:43 PDT </div> </div> </body>
diff --git a/git-rm.html b/git-rm.html index 3562ece..5f45d52 100644 --- a/git-rm.html +++ b/git-rm.html
@@ -933,10 +933,11 @@ with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) -still uses a .git directory, <code>git rm</code> will fail - no matter if forced -or not - to protect the submodule’s history. If it exists the -submodule.<name> section in the <a href="gitmodules.html">gitmodules(5)</a> file will also -be removed and that file will be staged (unless --cached or -n are used).</p></div> +still uses a .git directory, <code>git rm</code> will move the submodules +git directory into the superprojects git directory to protect +the submodule’s history. If it exists the submodule.<name> section +in the <a href="gitmodules.html">gitmodules(5)</a> file will also be removed and that file +will be staged (unless --cached or -n are used).</p></div> <div class="paragraph"><p>A submodule is considered up-to-date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren’t ignored are present in the submodules work tree. @@ -1003,7 +1004,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-14 08:35:15 JST +Last updated 2017-06-19 13:09:59 PDT </div> </div> </body>
diff --git a/git-rm.txt b/git-rm.txt index f1efc11..8c87e8c 100644 --- a/git-rm.txt +++ b/git-rm.txt
@@ -140,10 +140,11 @@ with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) -still uses a .git directory, `git rm` will fail - no matter if forced -or not - to protect the submodule's history. If it exists the -submodule.<name> section in the linkgit:gitmodules[5] file will also -be removed and that file will be staged (unless --cached or -n are used). +still uses a .git directory, `git rm` will move the submodules +git directory into the superprojects git directory to protect +the submodule's history. If it exists the submodule.<name> section +in the linkgit:gitmodules[5] file will also be removed and that file +will be staged (unless --cached or -n are used). A submodule is considered up-to-date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked
diff --git a/git-svn.html b/git-svn.html index 2ad1ced..6d54c04 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -1554,6 +1554,36 @@ repository (that has been <code>init</code>-ed with <em>git svn</em>). The -r<revision> option is required for this. </p> +<div class="paragraph"><p>The commit message is supplied either directly with the <code>-m</code> or <code>-F</code> +option, or indirectly from the tag or commit when the second tree-ish +denotes such an object, or it is requested by invoking an editor (see +<code>--edit</code> option below).</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> +-m <msg> +</dt> +<dt class="hdlist1"> +--message=<msg> +</dt> +<dd> +<p> + Use the given <code>msg</code> as the commit message. This option + disables the <code>--edit</code> option. +</p> +</dd> +<dt class="hdlist1"> +-F <filename> +</dt> +<dt class="hdlist1"> +--file=<filename> +</dt> +<dd> +<p> + Take the commit message from the given file. This option + disables the <code>--edit</code> option. +</p> +</dd> +</dl></div> </dd> <dt class="hdlist1"> <em>info</em> @@ -2476,7 +2506,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2017-06-13 14:15:40 PDT +Last updated 2017-06-19 13:09:59 PDT </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index fba0b4e..aa2aeab 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -459,6 +459,21 @@ (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn'). The -r<revision> option is required for this. ++ +The commit message is supplied either directly with the `-m` or `-F` +option, or indirectly from the tag or commit when the second tree-ish +denotes such an object, or it is requested by invoking an editor (see +`--edit` option below). + +-m <msg>;; +--message=<msg>;; + Use the given `msg` as the commit message. This option + disables the `--edit` option. + +-F <filename>;; +--file=<filename>;; + Take the commit message from the given file. This option + disables the `--edit` option. 'info':: Shows information about a file or directory similar to what
diff --git a/rev-list-options.txt b/rev-list-options.txt index a46f70c..9c44eae 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt
@@ -91,6 +91,7 @@ Consider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression). +-P:: --perl-regexp:: Consider the limiting patterns to be Perl-compatible regular expressions.
